Fixed Case Sensitive Issues