Finished Basic Enemy

Also added naming fixes