Class name cleans up after removing and replacing
Merge branch 'develop'