Changes non-functional image-name-matcher to imageId
This closes #118