(OFBIZ-11921) Also fixed some other extra space and naming related checkstyle issues observed. Thanks Jacques for review.