Fix hostname issue, weak sanitazion of names