Rename config to kconfig where needed (part II)