cleaned up naming conventions