Set up #wrapper, made name changes