Added class prefix + renaming of current classes