Rename, adaptor interface changes, security context usage