changed parameters for android push
changed name replacements
another try to fix double entries