Fixing services and vars name