71b92a5
1.21 - rework main macro to handle more corner cases, split naming logic in its own macro, add some debug output