NWUKFS-313 * More renaming and cleanup.