change script to follow fluent conventions