Bugfix and rename files