Add hostname to default naming schema