Fix imports to be consistency with other code.