add more name dependencies, start fixing some issues in rename
Merge branch 'master' of git.mobileinno.com:pclsync