cleaning up the names to map to peters brain... again...