#16 Setting a better name