updated name tags
Merge branch 'master' of https://github.com/c0d3m0nk3y/Konata.git