Improved naming conventions and adapted them to Android standards