Changed naming and file incompatibilities