Change error message name
First refactor for Android Secure Properties