fixed naming
more conventions