Fixed Bugs

Fixed issue replacing name, and hook not being called.