Revert the naming pattern