Fixed naming conventions
Fixed some compiler warnings