Checkstyle + fixes to names to make Spring happy.