Renamed props and packages with java naming conventions