consistent-ize naming