Improved the names hopefully