ENH Reorganize naming scheme