Renaming and a small tweak/fix