Cleaned up marker name logic