Merge new naming scheme and defaut settings

@fuyukaidesu