Cleaned up naming conventions on analytics menu