Renamed variable name and some methods for simpler readability from
ContextFactory