Fix packages name
Add context verification on android