fixing up naming conventions