Improved marker creation: removed suffixes and added MARKER_ prefix to empty objects instead