Fix #35 - Remove some classes from renaming list