Fixed class namespaces and methods for strict standards