Added prefixes to class names