Refactoring descriptor functions to generic methods.

Changing extractor variable names to make them shorter.