Renamed feature extraction functions according to coding conventions