Street naming policy to be ready in June