replace confusing entities with meaningful names
Authored by: techtonik 2007-02-12
Parent: [r915]
Child: [r917]