Fix name

Making names maintain some consistency in convention