Switch naming away from reserved name constructor

Signed-off-by: Eli Skeggs <skeggse@gmail.com>