last renames, that should close #298