Added namespace, changed class to uppercase