Removing some conflixting class aliases