Refactor bean names