Remove superfluous resolve() method and use more standardized names