Small fixes according to naming conventions