fixed naming to fit conventions