rename + general logic