rename directive, address comments