Fix: Use __name__ instead of custom NAME attribute for class registration

Fix: Use __name__ instead of custom NAME attribute for class registration #1345