Removed Android naming convention on props