fixed class namespace errors