Cleared up naming, making it more clear and avoiding collision