Changed default object naming to ease cleanup