Fixed the name/id bug with a little help from @76foxtrot