Rental cost calculation (#418), VIN uppercase conversion, minor renames