Renamed files and namespaces to stp