Added const to string, fixed naming