fix naming convention a little, I might work on iOS a bit too long
rename here and there to follow good standard