the great renaming/cleanup of 2014