[#3] moar renames