javadocs + defaultUri to uriPrefix rename

are you sure about english here? To me the "component where ..." sounds weird, but honestly don't know why - so this comment is definitely not preventing the merge ;-)