More FDB naming changes