Added consistency to naming