Replace remaining class names with plain names