Revert naming conventions