Rename functions, touchup class usage