Fixed some misleading names