Forgotten rename and small cleanup