Fixed up naming conventions