moving variables + rename