CF #17 #18 - Renaming