Rename feature file for consistency
include Utils rather than calling static methods