renamed both