Fix APT error related to NameUtils