Changed naming convention to better match java convention.