Slight rename and cleanup