style change: no underscores in object names