Renamed and fixed a few issues