Renames, finishing touches