Add missing dependency, fix naming