Made RPname restrictions more tight