Also move the resolveContextName() function together with the method for easier cross-referencing. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>