Updated namespace, renamed class