Replaced hard-coded class names