Local rules fix. Class names update