Fixed class namespace