add getter method and fix names.