updated templates to match Bean#getBeanName