Name convention

Some of the methods had wrong name convention