Updated methods to use BS3 names