naming convention bugfix