fixed the names to match style