Merge "Use capital as first letter for class names"