revert naming convention