Code refactor improvements: Fixing broken replace old package name on new name

Now: ![2014-05-08 14 54 27](https://cloud.githubusercontent.com/assets/1700940/2914724/eb3035ee-d69f-11e3-94d3-284ad2a1bb82.png)
Result: ![2014-05-08 14 52 44](https://cloud.githubusercontent.com/assets/1700940/2914728/f81d6ee8-d69f-11e3-921e-d0f6011233c5.png)

After fix: ![2014-05-08 14 54 27](https://cloud.githubusercontent.com/assets/1700940/2914733/155f25e6-d6a0-11e3-96c7-e283d2783476.png)
Result: ![2014-05-08 14 54 42](https://cloud.githubusercontent.com/assets/1700940/2914736/22612f78-d6a0-11e3-952f-b0389f18a2b2.png)