Port issue #749 (beanNameGenerator) & minor formatting