Fixed renaming from 2.0.1