Completes parameters of service descriptions
Clean up variable names