Improved filenames and css-class names