You can remove the second naming here (actually it should be updated)