More changes for ENTESB-2169 to conform to JBoss Developer Guidelines