[fix] rename variables and add dependencies