Making Layername unique

Making layer names unique to avoid clash with other loaded map paint
styles
Correcting order of arguments

Correcting order of arguments to avoid strange and cryptic messages