fixed naming etc