Rename builder methods
Optimize fluent interface