Fixing stage names and ids