Renaming files/classes with usual convention --kazu