Clean up && rename devices