consistent-ify naming scheme