rename of files, classes and methods to be more consistent