Renaming to fit convention