cleaned up naming bugs