Fixed some inconsistencies from name change