minor cleanup/rename