Finish encapsulation + rename