Fixed related to name change