small rename modifications