Container rename

In order to remove collision of names ("_container" is protected), injected "Container" is renamed to "DiContainer" and "_container" to "Container".