Change misleading names