Class names tweaking