Another naming scheme restructure.