Changed misleading names and comments