Remove ugly C#-style naming from factory functions