UPDATE: rename

Renamed some files and edit the static ids