Are 'etch' and 'testing' still one and the same?

["Patrick Wiseman" <pwiseman@gmail.com>]

Hello:

I ask because I just did my weekly aptitude update (with 'testing' in my sources.list - with one exception) and got a whole load of updates, even though people say etch is frozen.

The exception is that the 
sources.list lines getting security updates refer to etch; should they refer to 'testing'?  Something else?

Patrick