Remove namespace for correct loading