Complete class and file rename.