Clean up initializer naming.