more fixes regarding name change