removed useless globals
fixed object name inconsistencies