Fix naming namespaced locals
Fix naming namespaced locals
fix back
Fix naming namespaced locals
add base name to resources
use base name instead of name
base name method for resources
Merge branch 'patch-1' of git://github.com/mixan946/sync into mixan946-patch-1